add check for y > tree_view->priv->height (fixes #76974)

Mon Apr  1 22:20:24 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add
        check for y > tree_view->priv->height (fixes #76974)

Mon Apr  1 22:19:39 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get
        the stamp changes right this time

Mon Apr  1 22:13:24 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only
        disconnect the ref callbacks when model == proxy (Thanks go to
        Manuel Clos Crespo for the remote debugging)

diff --git a/ChangeLog b/ChangeLog
index 7544e3e23133d173866039c61854f235735d29db..ae0bf75b9f89d76472d92f8a49472fd340bfd42b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Apr  1 22:20:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add
+       check for y > tree_view->priv->height (fixes #76974)
+
+Mon Apr  1 22:19:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get
+       the stamp changes right this time
+
+Mon Apr  1 22:13:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only
+       disconnect the ref callbacks when model == proxy (Thanks go to
+       Manuel Clos Crespo for the remote debugging)
+
 Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7544e3e23133d173866039c61854f235735d29db..ae0bf75b9f89d76472d92f8a49472fd340bfd42b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+Mon Apr  1 22:20:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add
+       check for y > tree_view->priv->height (fixes #76974)
+
+Mon Apr  1 22:19:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get
+       the stamp changes right this time
+
+Mon Apr  1 22:13:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only
+       disconnect the ref callbacks when model == proxy (Thanks go to
+       Manuel Clos Crespo for the remote debugging)
+
 Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7544e3e23133d173866039c61854f235735d29db..ae0bf75b9f89d76472d92f8a49472fd340bfd42b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,19 @@
+Mon Apr  1 22:20:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add
+       check for y > tree_view->priv->height (fixes #76974)
+
+Mon Apr  1 22:19:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get
+       the stamp changes right this time
+
+Mon Apr  1 22:13:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only
+       disconnect the ref callbacks when model == proxy (Thanks go to
+       Manuel Clos Crespo for the remote debugging)
+
 Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7544e3e23133d173866039c61854f235735d29db..ae0bf75b9f89d76472d92f8a49472fd340bfd42b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+Mon Apr  1 22:20:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add
+       check for y > tree_view->priv->height (fixes #76974)
+
+Mon Apr  1 22:19:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get
+       the stamp changes right this time
+
+Mon Apr  1 22:13:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only
+       disconnect the ref callbacks when model == proxy (Thanks go to
+       Manuel Clos Crespo for the remote debugging)
+
 Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7544e3e23133d173866039c61854f235735d29db..ae0bf75b9f89d76472d92f8a49472fd340bfd42b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+Mon Apr  1 22:20:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add
+       check for y > tree_view->priv->height (fixes #76974)
+
+Mon Apr  1 22:19:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get
+       the stamp changes right this time
+
+Mon Apr  1 22:13:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only
+       disconnect the ref callbacks when model == proxy (Thanks go to
+       Manuel Clos Crespo for the remote debugging)
+
 Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7544e3e23133d173866039c61854f235735d29db..ae0bf75b9f89d76472d92f8a49472fd340bfd42b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+Mon Apr  1 22:20:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add
+       check for y > tree_view->priv->height (fixes #76974)
+
+Mon Apr  1 22:19:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get
+       the stamp changes right this time
+
+Mon Apr  1 22:13:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only
+       disconnect the ref callbacks when model == proxy (Thanks go to
+       Manuel Clos Crespo for the remote debugging)
+
 Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,

diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 9749a4ddb20b86984d0f4b301c0c448212e76e9a..e516b976038d409cce74fa46cc09631c25e4a91b 100644 (file)
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -1677,7 +1677,9 @@ gtk_tree_row_reference_free (GtkTreeRowReference *reference)
 
   if (refs->list == NULL)
     {
-      disconnect_ref_callbacks (reference->model);
+      if (G_OBJECT (reference->model) == reference->proxy)
+       disconnect_ref_callbacks (reference->model);
+
       g_object_set_data (G_OBJECT (reference->proxy),
                         ROW_REF_DATA_STRING,
                         NULL);

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 1869090759bb25a926bfb4fb6ddc95633de39f0a..038251d5b884f227e809954b8a18a95ed1e66b50 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -1512,6 +1512,7 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
 
   if (emit_reordered)
     {
+      gtk_tree_model_sort_increment_stamp (tree_model_sort);
       if (level->parent_elt)
        {
          iter.stamp = tree_model_sort->stamp;

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index fdd920dcc0508e40ae7a2331ee2cf374fd6d76aa..5d34033b004e73cf1d1d86514a440798e28d0201 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6954,6 +6954,9 @@ gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view,
              tree_view->priv->expander_size);
   y = CLAMP (y, (gint)tree_view->priv->vadjustment->lower,  (gint)tree_view->priv->vadjustment->upper - vertical_separator);
 
+  if (y > tree_view->priv->height)
+    y = tree_view->priv->height - 1;
+
   _gtk_rbtree_find_offset (tree_view->priv->tree, y, &cursor_tree, &cursor_node);
   cursor_path = _gtk_tree_view_find_path (tree_view, cursor_tree, cursor_node);
   g_return_if_fail (cursor_path != NULL);